Convert GTK_TYPE_CTREE_NODE to pointer derivation instead of boxed

Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
        derivation instead of boxed derivation.

        * gtk/gtkmarshal.list: Remove some now unused marshallers.

diff --git a/ChangeLog b/ChangeLog
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e43b75f4792f0d4f7630b1b8e658196c38cb5b61..42fd8e92f91c73218ede74c63dddf7a3c0148fbe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Nov  3 13:57:21 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
+       derivation instead of boxed derivation.
+ 
+       * gtk/gtkmarshal.list: Remove some now unused marshallers.
+ 
 2001-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 2ca063185d2003c68571fdb95dc2ac415b8ad651..a52175d5fcab426caad3d16555f225e3e5023af1 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -432,45 +432,45 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
-                   gtk_marshal_VOID__BOXED_INT,
+                   gtk_marshal_VOID__POINTER_INT,
                    GTK_TYPE_NONE, 2,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
+                   GTK_TYPE_CTREE_NODE,
                    GTK_TYPE_INT);
   ctree_signals[TREE_UNSELECT_ROW] =
     gtk_signal_new ("tree_unselect_row",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
-                   gtk_marshal_VOID__BOXED_INT,
+                   gtk_marshal_VOID__POINTER_INT,
                    GTK_TYPE_NONE, 2,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
+                   GTK_TYPE_CTREE_NODE,
                    GTK_TYPE_INT);
   ctree_signals[TREE_EXPAND] =
     gtk_signal_new ("tree_expand",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
-                   gtk_marshal_VOID__BOXED,
+                   gtk_marshal_VOID__POINTER,
                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE);
+                   GTK_TYPE_CTREE_NODE);
   ctree_signals[TREE_COLLAPSE] =
     gtk_signal_new ("tree_collapse",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
-                   gtk_marshal_VOID__BOXED,
+                   gtk_marshal_VOID__POINTER,
                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE);
+                   GTK_TYPE_CTREE_NODE);
   ctree_signals[TREE_MOVE] =
     gtk_signal_new ("tree_move",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
-                   gtk_marshal_VOID__BOXED_BOXED_BOXED,
+                   gtk_marshal_VOID__POINTER_POINTER_POINTER,
                    GTK_TYPE_NONE, 3,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
-                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE);
+                   GTK_TYPE_CTREE_NODE,
+                   GTK_TYPE_CTREE_NODE,
+                   GTK_TYPE_CTREE_NODE);
   ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] =
     gtk_signal_new ("change_focus_row_expansion",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
@@ -6126,30 +6126,13 @@ gtk_ctree_drag_data_received (GtkWidget        *widget,
     }
 }
 
-/* dummy boxed type definition, used so that the GtkCTreeNode signal
- * arguments have a reasonable type.
- */
-static gpointer
-ctree_node_copy (gpointer boxed)
-{
-  return boxed;
-}
-
-static void
-ctree_node_free (gpointer boxed)
-{
-  /* nothing */
-}
-
 GType
 gtk_ctree_node_get_type (void)
 {
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkCTreeNode",
-                                             (GBoxedCopyFunc)ctree_node_copy,
-                                             (GBoxedFreeFunc)ctree_node_free);
+    our_type = g_pointer_type_register_static ("GtkCTreeNode");
 
   return our_type;
 }

diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list
index 84b23e024c0aaaf305aeb0ece97bed966f0e28c9..e4917325580617b6236eea30becf0c8ec7520b6b 100644 (file)
--- a/gtk/gtkmarshal.list
+++ b/gtk/gtkmarshal.list
@@ -44,12 +44,10 @@ VOID:BOOLEAN
 VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOXED
 VOID:BOXED,BOXED,POINTER
 VOID:BOXED,POINTER
 VOID:BOXED,OBJECT
 VOID:BOXED,STRING,INT
-VOID:BOXED,INT
 VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
 VOID:BOXED,UINT,UINT

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 84b23e024c0aaaf305aeb0ece97bed966f0e28c9..e4917325580617b6236eea30becf0c8ec7520b6b 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -44,12 +44,10 @@ VOID:BOOLEAN
 VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOXED
 VOID:BOXED,BOXED,POINTER
 VOID:BOXED,POINTER
 VOID:BOXED,OBJECT
 VOID:BOXED,STRING,INT
-VOID:BOXED,INT
 VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
 VOID:BOXED,UINT,UINT